From: Pavel Janík <Pavel@Janik.cz>
Date: Sun, 24 Mar 2002 15:25:11 +0000 (+0000)
Subject: (mouse-wheel-mode): Use the result of current-global-map instead of the
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~58094
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=49e30cd638ceaf4819d5b8da1a5611e53fdb2b58;p=emacs.git

(mouse-wheel-mode): Use the result of current-global-map instead of the
variable `global-map'.
---

diff --git a/lisp/mwheel.el b/lisp/mwheel.el
index 27a487d0ef6..bd99c00fa74 100644
--- a/lisp/mwheel.el
+++ b/lisp/mwheel.el
@@ -169,9 +169,9 @@ Returns non-nil if the new state is enabled."
     (condition-case ()
 	(dolist (key keys)
 	  (cond (mouse-wheel-mode
-		 (define-key global-map key 'mwheel-scroll))
-		((eq (lookup-key global-map key) 'mwheel-scroll)
-		 (define-key global-map key nil))))
+		 (define-key (current-global-map) key 'mwheel-scroll))
+		((eq (lookup-key (current-global-map) key) 'mwheel-scroll)
+		 (define-key (current-global-map) key nil))))
       (error nil))))
 
 ;;; Compatibility entry point